Revert fc64232..ae6c186

This rolls back to commit fc64232e2ee2a6e8742169c165d9daa598192cda.
Fixed stuff that I messed up when I played with it!