Revert 8ff84ff..eb1ba47

This rolls back to commit 8ff84ffa84d7f5d3d900a4b0f008f38faf484e9a.