Revert 3489a16..288dbf5

This rolls back to commit 3489a161e1698840c4bf2107d71dc9611613f581.
Reverted to estomote -> master