Revert aef2cb1..0e764e9

This rolls back to commit aef2cb1483877c512b1ddc36aa684170fb8354fc.