Revert 2f5224b..6cc6789

This rolls back to commit 2f5224b50693c4592f9c3cb226606c46d641767a.