Revert from commit 669e656a6d1cd2c85a2632a0189fb01be8ba2f75