1.3
Revert daba014..4f5f27a

This rolls back to commit daba014f645cbf9ab9eba1e73d7c5a03ad2791b8.