Revert 326f1cb..09b5ba1

This rolls back to commit 326f1cb61dbc4ffb76a0492c1d6f3aeebce4a8ef.