Revert 76bc359..4d72b4b

This rolls back to commit 76bc359cc429dcb6d30bed36f867a23b99973f39.