Revert 8c616d0..a4a464f

This rolls back to commit 8c616d06f3d31ebd78849610f6d95b6b518ad117.