- Undo commits 121d323 and 1c12278 - Add TODO's with issue number - Add slight, necessary adjustments for code changes since the reverted commits
121d323
1c12278