This reverts commit c9944b411ed3bdbbbea6c972dde26242e8a51a57. Causes infinite recursion, revert for now while exploring possible solutions.
This reverts commit c9944b411ed3bdbbbea6c972dde26242e8a51a57. Causes infinite recursion, revert for now while exploring possible solutions.