Revert 4558ab7..d94c74c

This rolls back to commit 4558ab702850569aa1ddca046a04b6f0fe85e11f.