Revert b6dba10..0d754ee

This rolls back to commit b6dba10ae59215b5c4e40f7632563f592f138c87.