Revert 066f718..96f01e5

This rolls back to commit 066f7188aa3217e54e8e20823ec74d174cd240b3.
prepping chris merge