Revert 646e2d1..aaf35be

This rolls back to commit 646e2d1494f9b0f950c21780b44e45e6214d5521.
Second Post