This wasn't exactly able to handle all situations, so we removed
our use of it in Builder (which is better anyway). So now remove
this so we don't accidentally start relying on it in the future.