Revert cf7de46..22b31d7

This rolls back to commit cf7de468ca90e6217539ebad7fc2e85fef70d297.