Revert 3ce520b..de182fb

This rolls back to commit 3ce520b1d3319d912885358bf10e2eaffa0caba8.