Revert "AH-274 Merged in master"

This reverts commit c869f98866a8084a6d6472656b62b3f534c56a48.