Revert "Rolled back commit"

This reverts commit 0294c6bf7740e3a9e7dcf047341808fff1e897c4.