Revert 31da343..6f12a00

This rolls back to commit 31da343209dfce6438369ca93ab009c1a424af52.