Revert cc259e2..d8364a8

This rolls back to commit cc259e2082a8c3b14a47d31a3a66dfec53a183a6.