Revert "1.1.12.1 hotfix."

This reverts commit 0a6bc94b076bbfb57e8d69a6209476f41b348b55.
1.1.12.1 hotfix.