Revert 75df741..4af3dc9

This rolls back to commit 75df741474deea3b423bbe4da92548c868d0c5cd.