Revert 86cd664..938efb9

This rolls back to commit 86cd664a3eda73cab9b754fe3fb9fb6b6f0b7502.