Revert 49007b7..6ec74c8

This rolls back to commit 49007b7e52c40c7255f8e9d39255cf8058d7d30b.