Revert ae20c4d..a92f03b

This rolls back to commit ae20c4df5f49b5b0c86082e4a5c6a6ce0e4b21af.