Revert 8d4603d..eda3fb0

This rolls back to commit 8d4603d66e801bffc9ca9662c7850804c5bc7817.
Dinosaur 1+2