Revert ee60f2f..355fd57

This rolls back to commit ee60f2f1b795c506c4616f1ad7bb674532272650.