Revert 1737ffe..cf75fda

This rolls back to commit 1737ffe791bfd3b5936e2f3679764f41a4d35ca2.
project3