Revert 5fe9c1b..43d6554

This rolls back to commit 5fe9c1b4e73b605e43b2ad04ee57770d53c3e493.