Revert "Revert "Stein fixed Custom?""

This reverts commit b6c05ecac251956e82e8b3d094b2ddac3d5075ab.