Revert "Merge branch 'ATR'"

This reverts commit 804bb4002f2e0ff01c73ea1548d929d7e38202b2, reversing
changes made to 8cf938cd7ad0eecdb49238a322225c3dbd6f434e.