lesson MDL-23525 committing this fix after its passed the tests in the bug/QA.