This reverts commit 3fcdf2fa. Sorry I was too hasty with my commit, I will review Andy's comments and resubmit.