Revert 661e7e4..3df4649

This rolls back to commit 661e7e46653e64d24212cc53486c72eff2eb678f.