Revert 21607ae..9f74983

This rolls back to commit 21607ae5fdff09c77df2c8194ce6c675dca5f98a.