Revert b411f50..f257c0f

This rolls back to commit b411f502fa26139e6715712afd752c17ffc45670.