Reverted [317e74ef9b], moving PIN dialog changes to a different branch