Revert a6f981a..e503635

This rolls back to commit a6f981abc4a30218c889754c2f78aeded249049e.