Revert 9dd2516..c1909ab

This rolls back to commit 9dd25163e5140c7a31193244ac360196d799d820.