Revert 4e5b750..3028776

This rolls back to commit 4e5b750c46a559c815a8e3e43a61c48f97cb4859.