Revert e99b12b..edecdc1

This rolls back to commit e99b12b7ce895b799fdd3528a2d3e3e41500bf39.