1d155e52b Properly implement functionality of 4fad4276ef