Revert 0058c33..4df2e48

This rolls back to commit 0058c338582c125d8305c761ce5a16353d0a6a3a.