Revert 46c65f8..c57588e

This rolls back to commit 46c65f81c535230015fc9482be5fcc9a4980c6f0.