Revert "Fixed build"

This reverts commit aab58e60a5ea3fb5ec098b05aa0bf902548c60fb.
Revert "Added test for backward compatibility"

This reverts commit 5d96a393d802a9baed8595026d49f9a891202ab9.