Revert c26aaf5..448d2e9

This rolls back to commit c26aaf5d4d55c7ed124276f7c0303fe11484a42e.