revert semarie's patch