Revert to 5bb45c07a6968a1468ab014b8ff2e44f0d8990e0
EditField Fixes, Compiler Fixes