This reverts commit c3b11f9cfb. Accidentally pushed to master, instead of my fork. Backing it out.
c3b11f9cfb