Revert e5cd462..b1aa442

This rolls back to commit e5cd46250294e06b27863abe17fec33d2cccc3ef.