Re-added changes from c3401c6