Revert 4860c70..2f288c0

This rolls back to commit 4860c70454fa487ae1adea7e8263fb044cf6baea.
dsadas