Revert 123e46a..b907d0c

This rolls back to commit 123e46aa8355888c9d92600d5c73ec3d8880049e.