Revert bdd3996..41e31ef

This rolls back to commit bdd3996d38d885e18e5c5960df1c2c06e34d673f.