Revert cb599af..6a15685

This rolls back to commit cb599aff8c0bb74bbe3a5a7e56ed8238231e9fe2.