Revert changes accidentally added from angular_compatibility branch