Revert dcca033..679dcb3

This rolls back to commit dcca03348d40525dba39a994a8a44f106415269d.