Revert accidental commit that added WIP from another branch

This reverts commit d479c6306c64e9c672ebcc89fecec30749b9679c.