Revert "merge from cooljeanius-private"

This reverts commit 5020eeca3e233d197ea3e37fe7cb9864976db24a, reversing
changes made to ac00f9584135917b538520314822feace13d17f9.