Revert 0dfb678..e9af5ba

This rolls back to commit 0dfb678a69a4f6c00613c5a65ad90f964b65dd4f.
Q