Revert 9d2bcb5..56bd49c

This rolls back to commit 9d2bcb5e9515fb8cf5b35d916cfa6b5a1ea27470.
aa