Reverted #6 and #3 before re-patching #3