Revert 4ffb725..ed45f35

This rolls back to commit 4ffb72536764721e035ac7b682d4b5eb9ac2bbb3.