Reverting this change; fixed nothing and exposed another issue