Revert 0fc9fcf..8a8706b

This rolls back to commit 0fc9fcfd2c58b9ed1591465bd254a704b70d2d9b.