revert permalink patch 6f142a255edeab12c2f976cf5481c2979004258a
add todo