Revert 5ec593d..aef9d16

This rolls back to commit 5ec593daa18aecc3224d541e49a817a811b0ea4e.