Revert 02a6511..cd0c98c

This rolls back to commit 02a65112d04df707a9497281fd3118b23dca534f.