[EXT-283] Revert previous commit. Not my fault.