Revert da70ef3..f49fd54

This rolls back to commit da70ef37010f54c0f6742d3898a19568cfbf6510.