Revert test from 163570641c6f3f0f1a6ac169be9ce17785a4c79f