Revert 05eb32f..ee5d587

This rolls back to commit 05eb32fceb915aeacd925128ecd217917e343982.
trying again