Revert 2eb8531..50e678e

This rolls back to commit 2eb85317d24a3a0a7ec851cea276a44a3d276368.