Revert f9559a1..24f9511

This rolls back to commit f9559a1a59452a9efeeba0b05a0fb2afd265b5bc.