Revert changes of 847a302
Rewrites specs