Revert b245bff..ceaba83

This rolls back to commit b245bff59619cbb2c38d90a28762c4423d20c1fb.
good old calvin :)