Undo breaking change

YacovGold's change breaks functionality. I'm undoing that change until, if needed, a change can be submitted that doesn't break things.