My first version of the commit was based on this, however, I preferred to go the long way in order to preserve #435