Reverting master branch to revision
b1faec28e488757ef7496319512ee3db00695a25 from Oct. 30, 2013.