Reverted the wrong patch... putting it back (revert of a revert) This reverts commit 157a60f1b396ab9adc7f934a15352f2dbc5493a9.