Revert part of previous faulty patch