Revert "1416035824 hmm"

This reverts commit 4dcb0b2ed660f248da73d764e2250eb374b6ed4a.
Revert "1416034020 hmm"

This reverts commit 49bb3cabe9e978d3515adafa9a130bbb3f579639.
1416036725 hmm