Reverting to old, stable behavior once again -- need to fix and re-incorporate new functionality ASAP...