Revert e5f3b6d..3f3fba5

This rolls back to commit e5f3b6df896b7da4cf45b1597184604b36fd15ce.