Is this conditional due to the WIP nature of the code, or is this expected to stick around?