Revert 535d78f..3abb823

This rolls back to commit 535d78f3d6a41b04b53ebf7fbe24bddc1863a174.