Revert to commit 4c5fdcc7e6e544897681a3940ad1da6ceabd6885