Revert 471b323..017f013

This rolls back to commit 471b3233d8d8e1c2aecffa06ccd357ab8f02cc47.