Still not really working.
Revert 7f66203..2e4ebde

This rolls back to commit 7f6620339dd0afee7409a5d49efcd290f21c13cd.