Revert 30f06e0..e748102

This rolls back to commit 30f06e049b6fe0d05fdb4f66ce2a1e69d95dec48.