Revert 46aa723..73facb0

This rolls back to commit 46aa72390a31e81351571b5c6df6678fd339cde3.