Revert c124eec..af8e7a3

This rolls back to commit c124eec0edbe72c2be17aaa3178d9cb5a3583fa9.