Revert bc9b89e..e701de6

This rolls back to commit bc9b89e0b1e5dc3e6b291e6337514d7cd49a198a.
qwd