Reverting commit #390e956