Revert "Switch Reverse to the transformers 0.4 style"

This reverts commit 3522f8665c502d7c598ce48fea61264bb8636e01.
switch back to traditional accessors
swap the flag check order to cut backtracking