Revert 169c962..fc8b674

This rolls back to commit 169c9626b73afb0e4025fc9ffd7bbd7daf7e9918.