Revert 15532ae..034485f

This rolls back to commit 15532ae731db6149bbfffc30b70a3cf7a6b6ccc1.