pulling back to 1.6b4 for now