trying to get this thing working again
Not sure why this won't work
Revert fe94c8f..0120992

This rolls back to commit fe94c8f821c2e6e93c7462c72c07dad9c9ba806d.
Trying to revert to get things working again.