This should no longer be necessary, right?