Revert a5b4e46..b23f007

This rolls back to commit a5b4e469ec1d9b5402bd7236b3c1d5adb2787117.
Updated all the files you should ignore.