Revert d4acade..cd36968

This rolls back to commit d4acadeef0044d7a17ccaa86a455900e4d68854e.