Revert e8ec6f5..fd267ac

This rolls back to commit e8ec6f53948a6b447d155601c805d85cf621061d.