Reverting to a382cfc1ad (Oct. 11, 2013)