Revert 6cfc5ac..3f776f0

This rolls back to commit 6cfc5acf56e5fca1c3e23acdedf35fd9c6abbbcf.