Reverted partial revert of 109 commit