Rollback to 6c58e01, making changes easier to handle :)