Revert commit 261708645405d31c4fafccf78e6d3fb9ff827294