Revert to original implementation