Revert cc9ceb5..38116ff

This rolls back to commit cc9ceb52868fd0d7345c2934cffcfd56bcbd67da.