Revert 3c2b5b1..8a78b12

This rolls back to commit 3c2b5b107ce9f355c25d25c25db083a839376cd0.