Revert 533ff3f..1ade928

This rolls back to commit 533ff3f1bc3d6d9e37194915e2ee08234537b552.
...