Revert e9328c4..267de2c

This rolls back to commit e9328c4ebeb6fe6fa6edafe6135380fe3819a360.