Revert 641b6e1..b6f83b2

This rolls back to commit 641b6e13a128fd2bda561eb2c7ec8a555b720ca3.