Revert dbea699..b076d54

This rolls back to commit dbea699446d2cffdcd34a5709960345a7312a9d6.
Actual First Commit Take 2