Revert d8de727..d54e345

This rolls back to commit d8de72751f6e5b203433ddb152e691b9f05a2958.