Revert 669513c..d7b1923

This rolls back to commit 669513c3494ae86f12bf2bd976c8e5f89097d282.
Post-testing on Lab machine