Reverse previous commit

[ticket: X]