Yeah, this looks a bit fishy and this is likely just working around the real problem. @jketreno ^