Revert "Merge pull request #1314 from asolove/MON-109"

This reverts commit 59e9446582c4c645823f84ebe21c0feacf529d91, reversing
changes made to 95923f5c326040f6cda7de58e10b63cb0c9a1bce.