Revert 309674d..fc79164

This rolls back to commit 309674d55c3c2c518ad479199ef43ba01bb8dc88.