Revert "Night's work"

This reverts commit 1da3e8eeccfce573f1f64dc528cb7c0594ef34ed.