I'll revert, but keep in mind that this may break any other code you have depending on it.