made a partial revert for commit 497ef2c5b8d311e6118763ebd1c9baf2a88c8c6b