revert
Revert bf2d06a..a76672f

This rolls back to commit bf2d06ac9cabbdca4afbdcdde343c44b9b3bda16.
Added oxygen style comments