Revert 2008ecb..46cd8ea

This rolls back to commit 2008ecba71782ad77af94a9e8c6b68534692a882.