Revert ef5c933..a1347eb

This rolls back to commit ef5c933607585d253d10bdedbe2738fb70145ceb.