Revert 593ea1b..215614e

This rolls back to commit 593ea1b64b84d1197bc2b3c0fde7fb0b5bc0b705.