Revert 7fcc056..fbd6511

This rolls back to commit 7fcc056de1d14656935cb9588e30a6b89436de07.