Rolled-back changes made in commit 75483195e0828d6a79160a37d754975562b25bc2