Revert 5e2713b..47f5814

This rolls back to commit 5e2713b2871531390754e2527b39903638618405.