I left it in as a reminder in case we run into limitations with the moment implementation. 
We can remove it, if you care about it.