Revert f12d437..22d339b

This rolls back to commit f12d4378a3a68108d62108117711d9f9912c69c4.
Reverted to Keiths last changes

This rolls back to commit 2c4a9201e9ec5b8cb9133caa9442e98cdb777911.