Revert bb4f7c1..9f86296

This rolls back to commit bb4f7c1d12147e9b1c0e0ce7f27b1bcfbe24b377.