Reverted my "bug fix"