[304] Revert all [304] work on master. Keep it on a branch.