Reverted changes from prior commit after finding adverse bugs created as a result