Reverted to more stable build