Revert 08bba79..ea70ed5

This rolls back to commit 08bba79d127f11abc7cd3610b7ff3848236bdb26.