Revert e4ff7b4..fdbae7a

This rolls back to commit e4ff7b4db5c7d97dd8c4bfb91af021a0188e1135.