Revert c8f0209..9ce694f

This rolls back to commit c8f020933b1e1799dd6dddea97d9a7ba8adec646.