Roll back to prior commit

Roll back to commit 698dba2a13ee28fc4e6b4e61b245eb2874701bf4