Revert 99f8b78..b0309d9

This rolls back to commit 99f8b78c357410f12a0a9912748dd25b73a062ab.
06.05-04