Revert 13ef3a5..fded25b

This rolls back to commit 13ef3a5260df710bb6d6af268f1f85ef56d34d3f.