Revert ad12ce7..82d7f1a

This rolls back to commit ad12ce74e63096bd21b4d76f977d368772752d11.