Revert "AH-332 Failed merge with AH-316"

This reverts commit a7befe908fefdfa6345006a3b7eefbbbe992f601, reversing
changes made to cf66c57ec52b5ddd5d76f401ebe761fab1fda030.
AH-332 Some testing done