Revert e1d5b7f..f02a4fb

This rolls back to commit e1d5b7f2a67fba7f734f7352120a057ffe3b7214.