Revert 61e08c8..e402471

This rolls back to commit 61e08c8838b396d0bcc312935de5257ae4403e23.