Revert fc25e03..318fa36

This rolls back to commit fc25e03764f5b6f50a788bca5fe2900f2f079603.
Revert 318fa36..2b84cf2

This rolls back to commit 318fa3626902da3015cc8b59fa36a85434c84a3b.