Revert addition of #33; need to revisit for 2.5, but can't be implemented in time for 2.4