Revert a2b689e..3183aaf

This rolls back to commit a2b689ecab73d47afca8ecefb6421715ceabd6a7.
back to original code