Reverting an earlier change that actually made things *worse* somehow