Amit Shah now back in BJP