Merging fixes. Please do not merge broken code to master. Branch or at
the very least, comment it out.