Revert d150c17..f683a58

This rolls back to commit d150c1739cdf1fec799ebe44929745c6d9715730.