Revert f256337..fa77e61

This rolls back to commit f2563379778c9d1cc42b1baec1ca732aa3ea2541.