Reverting back to master@{143232d92b}, to undo commit #902