Revert 5fda2c7..c83fd2e

This rolls back to commit 5fda2c77172a4d15f0bdbee0c46313af3d3633c8.