Revert ba32a80..8d969e7

This rolls back to commit ba32a80ac72949ee9efc6ce49b2f277e37e44ce7.