Revert "Dylan's dirty work"

This reverts commit 8ae9d2f3ed8dce8087c351a6bb858da7749da035.