Yeah pretty much revert everything and just do the change here I think it's
better to keep the code simple and readable when it is not a performance
concern.