Revert because I used the wrong file as a base.
This reverts commit 4b2d05c3f2c6723d887b6fdc4675815660f3a876.
Use correct version as base for changes