Revert 5496645..2efebbe

This rolls back to commit 54966452bf315eca9a08830da745996f047d9c09.