Back to original 1.3-stable