Revert 8a186cb..8f18e9d

This rolls back to commit 8a186cb33eb24be0efd6c7b1064455795fe45cdc.