Removed FACING and GUARDIAN macros, which are mainline in 1.11.x