Revert 66f23d7..3f5aeea

This rolls back to commit 66f23d7363fb81dc3b08ff62e3fa17867bf7cc77.