Revert "Revert "Great Scott!""

This reverts commit 2752c062398f6085787c8c68ae43ff23ae5f0def.
Revert "Revert "Revert fcf0019..3650ec2""

This reverts commit 3a7f66df3aed9aad7a90deebb7982af8a1be2c2a.
Revert 3a7f66d..4154e06

This rolls back to commit 3a7f66df3aed9aad7a90deebb7982af8a1be2c2a.