Revert 2031d5c..05d35a1

This rolls back to commit 2031d5c0e5462f1d0daa040a581610783f5888bf.