revert pull 73, add serialize-time drop feature