Revert 5817760..ddf1fc7

This rolls back to commit 5817760275c97bf61a74ff5262964a74934ffb0b.