Revert b1ea813..5cb981c

This rolls back to commit b1ea81343a97eb0c37a0d34e0ba922ad9ead303e.