MAL: committing Amogha's changes that he emailed me on 04/19/14.