Revert 3e5e054..bf7833d

This rolls back to commit 3e5e054ee5dc24c74464d543f64bafcba4ae6c14.