Adding defunct implementation of #632