Revert 3afa00d..a805adb

This rolls back to commit 3afa00dd092c33b11d718d53d2cc456f88580a46.