CON-1016

*DO NOT MERGE*
Move that to the top.