Revert: Does not work as expected.