Revert "bug fix"

This reverts commit cdc559001323ace70bed91789378f71cd657bbf7.
Revert "cm-10.2 workaround"

This reverts commit 4a5023e5d063a73c7b85167897b7943a3b033320.