Revert a4e6b16..a3978f2

This rolls back to commit a4e6b16724ab66e65ab53ae29a2ac404c0d888b4.
pushed a couple of things