Revert "Merge pull request #473 from Tilka/frsp"

This reverts commit d369627d703a9380ccbbbba4be52a043e26b0e8d, reversing
changes made to 67ff926f1ee0037c98065dac518099cf82ebb7a7.