Revert e4e729e..2b8fca6

This rolls back to commit e4e729e04cc67cf5f504b851f3c06598010f650c.