Revert c3a3365..b9976c6

This rolls back to commit c3a3365c9f23b324dde75e462501866849d0eb18.