Revert e3817d3..9292200

This rolls back to commit e3817d3644086891a31fc0988dde83b674d0d009.