Revert "Revert "Revert "Stein fixed Custom?"""

This reverts commit 6076b1a09acab366e0209cf53bb2aad7b2550d2a.