Try to restore functionality and to instill sanity

Fails on both accounts.