Revert a4793ac..729686b

This rolls back to commit a4793ac066f1979c2ec47e9d766ee7dc1b021a8c.
Hmm