revert commit in favor of John's solution