Revert "rs: Fix build with ISO C++ 11 compilers"

This reverts commit 4da03cd0680db634a80f98697e5473597cb6c828.
Revert "rs: Fix mismatch between ENTRY and END points"

This reverts commit 7f11e1d9b5783e53f3c2c3d3e9a55658b32f2bb3.